build using system zlib

Gbp-Pq: Topic system
Gbp-Pq: Name zlib.patch

diff --git a/dlls/cabinet/Makefile.in b/dlls/cabinet/Makefile.in
index 6b7211aac8521bcd22c1651f7f10f47820541c52..a25d85cae80dc185f1b8d23137e91427937453e3 100644 (file)
--- a/dlls/cabinet/Makefile.in
+++ b/dlls/cabinet/Makefile.in
@@ -1,11 +1,12 @@
 MODULE    = cabinet.dll
 IMPORTLIB = cabinet
 
+EXTRA_LDFLAGS = -lz
+
 EXTRADLLFLAGS = -mno-cygwin
 
 C_SRCS = \
        cabinet_main.c \
-       deflate.c \
        fci.c \
        fdi.c
 

diff --git a/dlls/cabinet/fci.c b/dlls/cabinet/fci.c
index 1b72d7c77cc087eea81b817e51cd3b8a22bd2f25..92e968c95e9d52eebb1145959b535dd55f09dc47 100644 (file)
--- a/dlls/cabinet/fci.c
+++ b/dlls/cabinet/fci.c
@@ -30,6 +30,9 @@ There is still some work to be done:
 
 */
 
+#include "zlib.h"
+#undef FAR
+
 #include <assert.h>
 #include <stdarg.h>
 #include <stdio.h>
@@ -42,7 +45,6 @@ There is still some work to be done:
 #include "winerror.h"
 #include "winternl.h"
 #include "fci.h"
-#include "zlib.h"
 #include "cabinet.h"
 #include "wine/list.h"
 #include "wine/debug.h"

diff --git a/dlls/dbghelp/Makefile.in b/dlls/dbghelp/Makefile.in
index a370b94e7ce8987915a6ef7134d7cf5d12b33a62..7b5bef71410403d4a2bda4b49c5c440a2771838d 100644 (file)
--- a/dlls/dbghelp/Makefile.in
+++ b/dlls/dbghelp/Makefile.in
@@ -3,6 +3,8 @@ IMPORTLIB = dbghelp
 EXTRADEFS = -D_IMAGEHLP_SOURCE_
 DELAYIMPORTS = version
 
+EXTRA_LDFLAGS = -lz
+
 EXTRADLLFLAGS = -mno-cygwin
 
 C_SRCS = \
@@ -15,7 +17,6 @@ C_SRCS = \
        dwarf.c \
        elf_module.c \
        image.c \
-       inflate.c \
        macho_module.c \
        minidump.c \
        module.c \

diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c
index 53274c4f5978f94986cf4ab8489a7830c3503f1e..983a0c1d162f3cd361687bf20ef65107dcc5b4b9 100644 (file)
--- a/dlls/dbghelp/dwarf.c
+++ b/dlls/dbghelp/dwarf.c
@@ -22,6 +22,9 @@
 
 #define NONAMELESSUNION
 
+#include "zlib.h"
+#undef FAR
+
 #include <sys/types.h>
 #include <limits.h>
 #include <stdlib.h>
@@ -39,7 +42,6 @@
 
 #include "dbghelp_private.h"
 #include "image_private.h"
-#include "zlib.h"
 
 #include "wine/debug.h"
 

diff --git a/dlls/opcservices/Makefile.in b/dlls/opcservices/Makefile.in
index b55c79826d458d8a73a0f78ff5110e3f6c95e350..2dd110f9b36aaf3ca8fab6829b5811d861d87324 100644 (file)
--- a/dlls/opcservices/Makefile.in
+++ b/dlls/opcservices/Makefile.in
@@ -1,11 +1,12 @@
 MODULE  = opcservices.dll
 IMPORTS = uuid ole32 advapi32 urlmon xmllite oleaut32
 
+EXTRA_LDFLAGS = -lz
+
 EXTRADLLFLAGS = -mno-cygwin
 
 C_SRCS = \
        compress.c \
-       deflate.c \
        factory.c \
        package.c \
        uri.c

diff --git a/dlls/opcservices/compress.c b/dlls/opcservices/compress.c
index 0ee876512c1c0b2683b73d8cfdd2599438f3e09c..5bcc2ae2d81e4aea24fcaaa4b04a2cd7b8561049 100644 (file)
--- a/dlls/opcservices/compress.c
+++ b/dlls/opcservices/compress.c
@@ -16,6 +16,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "zlib.h"
+#undef FAR
+
 #define COBJMACROS
 
 #include <stdarg.h>
@@ -25,7 +28,6 @@
 #include "msopc.h"
 
 #include "opc_private.h"
-#include "zlib.h"
 
 #include "wine/debug.h"
 #include "wine/heap.h"

diff --git a/dlls/wininet/Makefile.in b/dlls/wininet/Makefile.in
index 88b70464f5c8a913d0bc20dd046773347ad1a3b9..5f8b4e8e2c51b269420394b25ce6cd702595f19d 100644 (file)
--- a/dlls/wininet/Makefile.in
+++ b/dlls/wininet/Makefile.in
@@ -4,6 +4,8 @@ IMPORTLIB = wininet
 IMPORTS   = mpr shlwapi shell32 user32 ws2_32 advapi32
 DELAYIMPORTS = secur32 crypt32 cryptui dhcpcsvc iphlpapi
 
+EXTRA_LDFLAGS = -lz
+
 EXTRADLLFLAGS = -mno-cygwin
 
 C_SRCS = \
@@ -12,7 +14,6 @@ C_SRCS = \
        ftp.c \
        gopher.c \
        http.c \
-       inflate.c \
        internet.c \
        netconnection.c \
        urlcache.c \

diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c
index 1eb046ed039ac69e9f8b70f6e7fdecddd68125fb..d4ee81c1e8d07e351f1e17f05c54b334be511778 100644 (file)
--- a/dlls/wininet/http.c
+++ b/dlls/wininet/http.c
@@ -27,6 +27,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "zlib.h"
+#undef FAR
+
 #include <stdlib.h>
 
 #include "winsock2.h"
@@ -53,7 +56,6 @@
 #include "winuser.h"
 
 #include "internet.h"
-#include "zlib.h"
 #include "resource.h"
 #include "wine/debug.h"
 #include "wine/exception.h"

diff --git a/tools/makedep.c b/tools/makedep.c
index edb243eeaa582ae306003f215f9b5e8e4fefdf6d..e39c0e4e93f57a6cf6f70e7ad5e60b2623b3a1e7 100644 (file)
--- a/tools/makedep.c
+++ b/tools/makedep.c
@@ -1567,14 +1567,6 @@ static struct file *open_include_file( const struct makefile *make, struct incl_
         }
     }
 
-    if (pFile->type == INCL_SYSTEM && pFile->use_msvcrt)
-    {
-        if (!strcmp( pFile->name, "stdarg.h" )) return NULL;
-        fprintf( stderr, "%s:%d: error: system header %s cannot be used with msvcrt\n",
-                 pFile->included_by->file->name, pFile->included_line, pFile->name );
-        exit(1);
-    }
-
     if (pFile->type == INCL_SYSTEM) return NULL;  /* ignore system files we cannot find */
 
     /* try in src file directory */
@@ -3297,6 +3289,7 @@ static void output_module( struct makefile *make )
 {
     struct strarray all_libs = empty_strarray;
     struct strarray dep_libs = empty_strarray;
+    struct strarray extra_ldflags = get_expanded_make_var_array( make, "EXTRA_LDFLAGS" );
     char *module_path = obj_dir_path( make, make->module );
     const char *debug_file = NULL;
     char *spec_file = NULL;
@@ -3365,6 +3358,7 @@ static void output_module( struct makefile *make )
     if (debug_file) output_filename( strmake( "-Wl,--debug-file,%s", obj_dir_path( make, debug_file )));
     output_filenames( all_libs );
     output_filename( make->is_cross ? "$(CROSSLDFLAGS)" : "$(LDFLAGS)" );
+    output_filenames( extra_ldflags );
     output( "\n" );
 
     if (make->unixobj_files.count)